From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 8 Mar 2021 18:59:23 +0000 (+0100)
Subject: windowManager: Limit super-scroll handling to normal mode
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~159
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fb1ab4f20b6566d7715a1327b326def601b36aa3;p=gnome-shell.git

windowManager: Limit super-scroll handling to normal mode

The overview has it's own workspace scroll handling, and we don't want
to switch workspaces in other modes. Limiting the scroll-event handler
to NORMAL mode matches the swipe tracker used by WorkspaceAnimation,
and allows for other uses of scroll events (like scrolling in the
alt-tab popup).

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3840

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1746>
---

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 93777db22..34c54b61e 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -864,6 +864,10 @@ var WindowManager = class {
                            this._switchToApplication.bind(this));
 
         global.stage.connect('scroll-event', (stage, event) => {
+            const allowedModes = Shell.ActionMode.NORMAL;
+            if ((allowedModes & Main.actionMode) === 0)
+                return Clutter.EVENT_PROPAGATE;
+
             if (this._workspaceAnimation.canHandleScrollEvent(event))
                 return Clutter.EVENT_PROPAGATE;